From 7b41388f8eb7be4e8250fe9f69194cf70f1a103b Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 9 Jun 2020 19:10:37 +0200 Subject: i think merge should work now. see commit details below: the old configure script did some weird stuff with the dist/ folder, as some files are already there in the js/ folder that are duplicated and empty. the new make generate script should fix that and work as expected. all files are there as far as I know. --- dist/cache_name.txt | 2 +- dist/js/app.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 7f45125..ec2c7e0 100644 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,4 +2,4 @@ -///site-static-1.0.14.3-beta-f4c921f||| +///site-static-1.0.14.3-beta-855d322||| diff --git a/dist/js/app.js b/dist/js/app.js index 6be1831..92f7540 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14.3-beta"; -const previous_commit = "f4c921fdfbae7845996128d0994be32760ffc977"; +const previous_commit = "855d322a78e4575e34500ba0b093f716b8631c30"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if ("serviceWorker" in navigator) { diff --git a/dist/pages/about.html b/dist/pages/about.html index aedba8d..9fc3725 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -160,7 +160,7 @@

- ^HEAD f4c921fdfbae7845996128d0994be32760ffc977 + ^HEAD 855d322a78e4575e34500ba0b093f716b8631c30

diff --git a/dist/sw.js b/dist/sw.js index 713203c..c8c206b 100644 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14.3-beta-f4c921f"; -// commit before the latest is f4c921fdfbae7845996128d0994be32760ffc977 +const static_cache_name = "site-static-1.0.14.3-beta-855d322"; +// commit before the latest is 855d322a78e4575e34500ba0b093f716b8631c30 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3